auto merge of #623 : alexcrichton/cargo/update_to_head, r=alexcrichton
authorbors <bors@rust-lang.org>
Mon, 22 Sep 2014 18:20:24 +0000 (18:20 +0000)
committerbors <bors@rust-lang.org>
Mon, 22 Sep 2014 18:20:24 +0000 (18:20 +0000)

Trivial merge